7dbd6344125c17046d0ffc8f894405a4f447ce8e,src/main/java/uk/co/eelpieconsulting/osm/nominatim/elasticsearch/ElasticSearchAutoCompleteService.java,ElasticSearchAutoCompleteService,taggedAsCountryCityTownSuburb,#,148

Before Change


		return boolQuery().minimumNumberShouldMatch(1).
			should(isCountry).boost(10).
			should(isCity).boost(8).
			should(isAdminLevelSixBoundary).boost(5).
			should(isCounty).boost(4).
			should(isTown).boost(3).
			should(isSuburb);

After Change


		QueryBuilder isCounty = termQuery(TAGS, "place|county");
		QueryBuilder isTown = termQuery(TAGS, "place|town");
		QueryBuilder isSuburb = termQuery(TAGS, "place|suburb");
		QueryBuilder isNationalPark = termQuery(TAGS, "boundary|national_park");
		QueryBuilder isBoundary = termQuery(TAGS, "boundary|administrative");
		QueryBuilder isAdminLevelSix = termQuery("adminLevel", "6");
		QueryBuilder isAdminLevelSixBoundary = boolQuery().must(isBoundary).must(isAdminLevelSix);

		return boolQuery().minimumNumberShouldMatch(1).
			should(isCountry).boost(10).
			should(isCity).boost(8).
			should(isAdminLevelSixBoundary).boost(5).
			should(isNationalPark).boost(5).
			should(isCounty).boost(4).
			should(isTown).boost(3).
			should(isSuburb);